Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: compatible with file.conf and registry.conf configurations #5668

Merged
merged 22 commits into from
Jul 4, 2023

Conversation

funky-eyes
Copy link
Contributor

@funky-eyes funky-eyes commented Jun 20, 2023

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

直接复用configurationfactory中load出来的fileconfiguration,fileconfiguration自带对老配置的读取,这怒地fileconfiguration读到的配置转换成springboot可识别的配置进行合并,优先级为自带的application.yml>老配置config,application.yml中没有的配置会从config中读取,全局顺序是-d>env>application.properties/yaml>file.conf&registry.conf
image

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@funky-eyes funky-eyes requested a review from slievrly June 21, 2023 16:35
@slievrly slievrly added this to the 1.7.0 milestone Jun 28, 2023
@funky-eyes funky-eyes added type: feature Category issues or prs related to feature request. module/config config module module/server server module labels Jul 2, 2023
@funky-eyes funky-eyes changed the title feature: seata-server support load registry conf feature: compatible with file.conf and registry.conf configurations in version 1.4.2 and below Jul 3, 2023
@slievrly slievrly changed the title feature: compatible with file.conf and registry.conf configurations in version 1.4.2 and below feature: compatible with file.conf and registry.conf configurations Jul 4, 2023
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module/config config module module/server server module type: feature Category issues or prs related to feature request.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants